Skip to content

Conversation

@Hweinstock
Copy link
Contributor

@Hweinstock Hweinstock commented Feb 13, 2025

Problem

Solution

  • It appears that there is an undocumented "feature" that GHA don't run when there is a merge conflict. See here
  • This means we don't have to handle the failure case where a merge fails.
  • Add fake config identity to mitigate this error:
image

Notes

Going to let this sit and make sure it works as changes are merged into master.


  • Treat all work as PUBLIC. Private feature/x branches will not be squash-merged at release time.
  • Your code changes must meet the guidelines in CONTRIBUTING.md.
  • License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

@Hweinstock Hweinstock marked this pull request as ready for review February 18, 2025 17:42
@Hweinstock Hweinstock requested a review from a team as a code owner February 18, 2025 17:42
@Hweinstock Hweinstock merged commit 46d76cb into aws:master Feb 18, 2025
26 checks passed
@Hweinstock Hweinstock deleted the jscpd/merge branch February 18, 2025 19:22
avi-alpert pushed a commit to leigaol/aws-toolkit-vscode that referenced this pull request Feb 19, 2025
…s#6572)

## Problem
- Follow up to
aws#6564 (review).

## Solution
- It appears that there is an undocumented "feature" that GHA don't run
when there is a merge conflict. See
[here](https://github.com/orgs/community/discussions/11265)
- This means we don't have to handle the failure case where a merge
fails.
- Add fake config identity to mitigate this error: 
<img width="913" alt="image"
src="https://github.com/user-attachments/assets/cd426ec7-e1ca-4d13-a3b1-3985b5593c07"
/>


## Notes
Going to let this sit and make sure it works as changes are merged into
master.


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: Justin M. Keyes <[email protected]>
leigaol pushed a commit to leigaol/aws-toolkit-vscode that referenced this pull request Feb 19, 2025
* fix(appbuilder): pass in the negative version of --use-container when using build quickpick (aws#6603)

## Problem
When users use appbuilder to build their lambda functions, they choose
between using their samconfig file or manually selecting the build
parameters/flags. The problem is that when the user selects build flags
and intentionally doesn't select the ```--use-container``` flag, the
command will still be run with --use-container if the samconfig file has
```use_container``` is set to true.

## Solution
Whenever the user manually selects the build flags and doesn't select
```--use-container```, we add the negative version of
```--use-container```, which is ```--no-use-container```. This serves as
an override if the samconfig file has ```--use-container``` set to true.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

* ci(jscpd): merge target branch in jscpd to avoid false negatives.  (aws#6572)

## Problem
- Follow up to
aws#6564 (review).

## Solution
- It appears that there is an undocumented "feature" that GHA don't run
when there is a merge conflict. See
[here](https://github.com/orgs/community/discussions/11265)
- This means we don't have to handle the failure case where a merge
fails.
- Add fake config identity to mitigate this error: 
<img width="913" alt="image"
src="https://github.com/user-attachments/assets/cd426ec7-e1ca-4d13-a3b1-3985b5593c07"
/>


## Notes
Going to let this sit and make sure it works as changes are merged into
master.


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: Justin M. Keyes <[email protected]>

* ci: fix and enable post-release notification (aws#6613)

- Enable for prod runs
- Fix script slightly because the way codebuild runs bash and the way my
local runs bash seems to not be the same.
- Tested on dev release pipeline

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

* refactor: notify.txt typos (aws#6616)

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

* config(amazonq): update polling config for codefix (aws#6617)

## Problem

Increase in codefix timeouts


## Solution

Increase default timeout and lower the polling frequency


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

* fix(amazonq): auto-review removes existing issues (aws#6535)

## Problem

Auto-reviews often produce less code issues than manual reviews, but the
current behavior is to remove all the issues in the file when processing
the new ones. This means that issues discovered by manual reviews but
not auto-reviews will silently disappear if auto-reviews is enabled.


## Solution

- Auto-reviews should not clear the previous issues, but instead merge
in the new results to the existing group.
- Fixed a related issue with the `ignoreIssue` command being flaky


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

* feat(amazonq): /doc: add support for infrastructure diagrams (aws#6561)

Problem:
- Amazon Q does not have support for infrastructure diagrams

Solution:
- Add support for them



![infra_diagram](https://github.com/user-attachments/assets/79693ab0-d95d-415e-8daf-04d59fed8573)

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Co-authored-by: Viktor Shesternyak <[email protected]>

* refactor(cleanup): remove dead code (aws#6619)

This does nothing anymore


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Signed-off-by: nkomonen-amazon <[email protected]>

* telemetry(auth): Update metrics to better debug Auth dropoff (aws#6625)

## Problem

We noticed that there was an auth dropoff between `session_start` with a
brand new clientId, versus when the `auth_userState` metric indicated
`isFirstUse` meaning the user is net new. We went from 12.7k for
`session_start` to 9.8k for `auth_userState`, these should have been
basically the same.

## Solution

Add in certain metrics to help debug where the discrepancy is coming
from:

- When we determine the user is a first time user, we will also check if
the clientId is newly generated. If this is not the case we know there
is a discrepancy here
- The relevant metric will be `function_call` with a `functionName:
isFirstUse`, `result: Failed`, and a `reason: ClientIdAlreadyExisted`
- When we determine the user is a first time user, if we detected that
they had previous auth connections, this will indicate a likely cause
for the discrepancy
- The relevant metric will be `function_call` with `reason:
UnexpectedConnections`
- We will emit metrics when the Auth Login page loads since that also
had a discrepancy and the telemetry did not exist
- The relevant metric is `webview_load` and it will indicate when the
Auth Login/Reauth page has actually loaded
- Previously we were observing the telemetry for the command
`aws.amazonq.focusChat`, but all this did was emit when called and
didn't confirm the UI actually loaded.
- We will also add the `isFirstUse` metric source value in to some other
existing metrics

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Signed-off-by: nkomonen-amazon <[email protected]>

---------

Signed-off-by: nkomonen-amazon <[email protected]>
Co-authored-by: Frederic Mbea <[email protected]>
Co-authored-by: Hweinstock <[email protected]>
Co-authored-by: Justin M. Keyes <[email protected]>
Co-authored-by: Maxim Hayes <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: Viktor Shesternyak <[email protected]>
Co-authored-by: Viktor Shesternyak <[email protected]>
Co-authored-by: Nikolas Komonen <[email protected]>
justinmk3 pushed a commit that referenced this pull request Mar 10, 2025
## Problem
There appears to be cases where the fix pushed here fails:
#6572.
ex: #6735
## Solution
- re-add the hint message for the case described here:
#6564
chungjac added a commit to chungjac/aws-toolkit-vscode that referenced this pull request Mar 11, 2025
fix endpoint

refactor(cw): remove unused keep-alive workaround.  (aws#6694)

This code is no longer used, and appears to have been moved to the LSP
side:
aws/aws-toolkit-vscode-staging#1214 (comment)

This fix also no longer works, and the work it was based off has
significantly changed their approach:
https://github.com/sourcegraph/cody/blob/62d73f78c432036d1f99bc9631ed534cc2ed846b/vscode/src/net/net.patch.ts

- remove it.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

test(e2e): increase file watcher count to prevent ENOSPC errors

test(amazonq): retry inline tests if no valid response was found

Merge pull request aws#6757 from jpinkney-aws/stabilize-test

test(amazonq): add retries to flaky e2e tests

telemetry(amazonq): status field tracking user actions aws#6750

- The current unit test generation telemetry event lacks a field to
distinguish between user actions: acceptance, rejection, failure, or
cancellation.

- Enhancing the amazonq_utgGenerateTests telemetry event by
incorporating a status field to capture user actions in toolkit metrics.
- Bumping telemetry version to `1.0.307`

fix(amazonq): incorrect zip entry path for file scans aws#6741

Reproduce steps:
1. Open a window with multiple workspace folders, for example
`workspaceFolders: [folder1, folder2]`
2. Open any file and run a code review on the active file, for example
`folder1/sample.py`
3. The zip entry will be created with the workspaceFolder duplicated,
for example `folder1/folder1/sample.py`

Explicitly set `includeWorkspaceFolder` to false when getting the
relative path of the file.

fix(amazonq): keyboard navigation in "Create a new prompt" overlay aws#6738

When a user selects "Create a new prompt", a mouse is required to 1)
select the prompt name input field and 2) click the Enter button. This
flow should be able to be completed with just the keyboard

Autofocus prompt input field, and allow submit on Enter key press.

fix(amazonq): duplicates in lsp getContextCommandPrompt aws#6756

There are two types of context shown in the context list:
1. the ones by explicit @
2. the ones by @workspace 1) has relativePaths with start/end line being
-1, 2) has relativePaths with non -1 start/end lines,
1) is doing dedupe with 2) but 1) also needs to dedupe itself

ci(jscpd): show hint message on detection of clones aws#6737

There appears to be cases where the fix pushed here fails:
aws#6572.
ex: aws#6735
- re-add the hint message for the case described here:
aws#6564

feat(amazonq): feedback system for internal users for /test aws#6748

- The unit test generation team lacks sufficient feedback to enhance the
quality of their produced tests.

- Implementing the feedback system for internal users to evaluate and
enhance unit test generation quality.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants